Auto merge of #1933 - steveklabnik:gh1855, r=alexcrichton
authorbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:08:03 +0000 (16:08 +0000)
committerbors <bors@rust-lang.org>
Tue, 25 Aug 2015 16:08:03 +0000 (16:08 +0000)
commit06b6704ea97c82eb966ba57a94a31abd1415f78f
treeb8534b0d78ad0333ac040cae889cd2e028c7bf52
parent176b5c17906cf43445888e83a4031e411f56e7dc
parenta9ded684eefcd00f1675e1a228ac56255149f287
Auto merge of #1933 - steveklabnik:gh1855, r=alexcrichton

Fixes #1855